Merge commit 'remotes/origin/upstream-cvs' into upstream
authorBernd Zeimetz <bernd@bzed.de>
Fri, 24 Jul 2009 20:55:00 +0000 (22:55 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Fri, 24 Jul 2009 20:55:00 +0000 (22:55 +0200)

Trivial merge